Repository : ssh://darcs.haskell.org//srv/darcs/haddock On branch : ghc-7.6
http://hackage.haskell.org/trac/ghc/changeset/5e746fa9e5dc4b210dab3b1fe1b120760b96f305 >--------------------------------------------------------------- commit 5e746fa9e5dc4b210dab3b1fe1b120760b96f305 Author: Simon Hengel <[email protected]> Date: Sun Oct 7 17:05:45 2012 +0200 cross-package test: re-export IsString instead of Monad There is a monad instance for Q, which is not available on platforms that do not have GHCi support. This caused CrossPackageDocs to fail on those platforms. Re-exporting IsString should test the same thing, but it works on all platforms. >--------------------------------------------------------------- tests/html-tests/tests/CrossPackageDocs.hs | 3 +- tests/html-tests/tests/CrossPackageDocs.html.ref | 204 ++------------------ .../tests/mini_CrossPackageDocs.html.ref | 4 +- 3 files changed, 24 insertions(+), 187 deletions(-) diff --git a/tests/html-tests/tests/CrossPackageDocs.hs b/tests/html-tests/tests/CrossPackageDocs.hs index de55060..4d529f7 100644 --- a/tests/html-tests/tests/CrossPackageDocs.hs +++ b/tests/html-tests/tests/CrossPackageDocs.hs @@ -1,3 +1,4 @@ -module CrossPackageDocs (map, Monad(..), runInteractiveProcess) where +module CrossPackageDocs (map, IsString(..), runInteractiveProcess) where import System.Process +import Data.String diff --git a/tests/html-tests/tests/CrossPackageDocs.html.ref b/tests/html-tests/tests/CrossPackageDocs.html.ref index 3935372..d0a306a 100644 --- a/tests/html-tests/tests/CrossPackageDocs.html.ref +++ b/tests/html-tests/tests/CrossPackageDocs.html.ref @@ -53,28 +53,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_CrossPackageDocs.html" ><span class="keyword" >class</span > <a href="" - >Monad</a - > m <span class="keyword" + >IsString</a + > a <span class="keyword" >where</span ><ul class="subs" ><li ><a href="" - >(>>=)</a - > :: m a -> (a -> m b) -> m b</li - ><li - ><a href="" - >(>>)</a - > :: m a -> m b -> m b</li - ><li - ><a href="" - >return</a - > :: a -> m a</li - ><li - ><a href="" - >fail</a - > :: <a href="" + >fromString</a + > :: <a href="" >String</a - > -> m a</li + > -> a</li ></ul ></li ><li class="src short" @@ -140,191 +128,39 @@ window.onload = function () {pageLoad();setSynopsis("mini_CrossPackageDocs.html" ><p class="src" ><span class="keyword" >class</span - > <a name="t:Monad" class="def" - >Monad</a - > m <span class="keyword" + > <a name="t:IsString" class="def" + >IsString</a + > a <span class="keyword" >where</span ></p ><div class="doc" ><p - >The <code - ><a href="" - >Monad</a - ></code - > class defines the basic operations over a <em - >monad</em - >, -a concept from a branch of mathematics known as <em - >category theory</em - >. -From the perspective of a Haskell programmer, however, it is best to -think of a monad as an <em - >abstract datatype</em - > of actions. -Haskell's <code - >do</code - > expressions provide a convenient syntax for writing -monadic expressions. -</p - ><p - >Minimal complete definition: <code - ><a href="" - >>>=</a - ></code - > and <code - ><a href="" - >return</a - ></code - >. -</p - ><p - >Instances of <code - ><a href="" - >Monad</a - ></code - > should satisfy the following laws: -</p - ><pre - > return a >>= k == k a - m >>= return == m - m >>= (\x -> k x >>= h) == (m >>= k) >>= h -</pre - ><p - >Instances of both <code - ><a href="" - >Monad</a - ></code - > and <code - ><a href="" - >Functor</a - ></code - > should additionally satisfy the law: -</p - ><pre - > fmap f xs == xs >>= return . f -</pre - ><p - >The instances of <code - ><a href="" - >Monad</a - ></code - > for lists, <code - ><a href="" - >Maybe</a - ></code - > and <code - ><a href="" - >IO</a - ></code - > -defined in the <a href="" - >Prelude</a - > satisfy these laws. + >Class for string-like datastructures; used by the overloaded string + extension (-foverloaded-strings in GHC). </p ></div ><div class="subs methods" ><p class="caption" >Methods</p ><p class="src" - ><a name="v:-62--62--61-" class="def" - >(>>=)</a - > :: m a -> (a -> m b) -> m b</p - ><div class="doc" - ><p - >Sequentially compose two actions, passing any value produced - by the first as an argument to the second. -</p - ></div - ><p class="src" - ><a name="v:-62--62-" class="def" - >(>>)</a - > :: m a -> m b -> m b</p - ><div class="doc" - ><p - >Sequentially compose two actions, discarding any value produced - by the first, like sequencing operators (such as the semicolon) - in imperative languages. -</p - ></div - ><p class="src" - ><a name="v:return" class="def" - >return</a - > :: a -> m a</p - ><div class="doc" - ><p - >Inject a value into the monadic type. -</p - ></div - ><p class="src" - ><a name="v:fail" class="def" - >fail</a - > :: <a href="" + ><a name="v:fromString" class="def" + >fromString</a + > :: <a href="" >String</a - > -> m a</p - ><div class="doc" - ><p - >Fail with a message. This operation is not part of the - mathematical definition of a monad, but is invoked on pattern-match - failure in a <code - >do</code - > expression. -</p - ></div + > -> a</p ></div ><div class="subs instances" - ><p id="control.i:Monad" class="caption collapser" onclick="toggleSection('i:Monad')" + ><p id="control.i:IsString" class="caption collapser" onclick="toggleSection('i:IsString')" >Instances</p - ><div id="section.i:Monad" class="show" + ><div id="section.i:IsString" class="show" ><table ><tr ><td class="src" ><a href="" - >Monad</a - > []</td - ><td class="doc empty" - > </td - ></tr - ><tr - ><td class="src" - ><a href="" - >Monad</a - > <a href="" - >IO</a - ></td - ><td class="doc empty" - > </td - ></tr - ><tr - ><td class="src" - ><a href="" - >Monad</a - > Q</td - ><td class="doc empty" - > </td - ></tr - ><tr - ><td class="src" - ><a href="" - >Monad</a - > <a href="" - >Maybe</a - ></td - ><td class="doc empty" - > </td - ></tr - ><tr - ><td class="src" - ><a href="" - >Monad</a - > PprM</td - ><td class="doc empty" - > </td - ></tr - ><tr - ><td class="src" - ><a href="" - >Monad</a - > ((->) r)</td + >IsString</a + > [<a href="" + >Char</a + >]</td ><td class="doc empty" > </td ></tr diff --git a/tests/html-tests/tests/mini_CrossPackageDocs.html.ref b/tests/html-tests/tests/mini_CrossPackageDocs.html.ref index 9d957c1..4c0588b 100644 --- a/tests/html-tests/tests/mini_CrossPackageDocs.html.ref +++ b/tests/html-tests/tests/mini_CrossPackageDocs.html.ref @@ -30,8 +30,8 @@ window.onload = function () {pageLoad();}; ><span class="keyword" >class</span > <a href="" target="main" - >Monad</a - > m</p + >IsString</a + > a</p ></div ><div class="top" ><p class="src" _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
