diff options
Diffstat (limited to 'html-test')
| -rw-r--r-- | html-test/ref/Bug1050.html | 4 | ||||
| -rw-r--r-- | html-test/ref/Bug280.html | 6 | ||||
| -rw-r--r-- | html-test/ref/Instances.html | 6 | ||||
| -rw-r--r-- | html-test/ref/SectionLabels.html | 1 | ||||
| -rwxr-xr-x | html-test/run | 3 | ||||
| -rw-r--r-- | html-test/src/Bug679.hs | 2 | ||||
| -rw-r--r-- | html-test/src/FunArgs.hs | 2 |
7 files changed, 10 insertions, 14 deletions
diff --git a/html-test/ref/Bug1050.html b/html-test/ref/Bug1050.html index 2d938656..b8b8ff0f 100644 --- a/html-test/ref/Bug1050.html +++ b/html-test/ref/Bug1050.html @@ -93,11 +93,11 @@ >mkT</a > :: <span class="keyword" >forall</span - > k (f :: <span class="keyword" + > {k} {f :: <span class="keyword" >forall</span > k1. k1 -> <a href="#" title="Data.Kind" >Type</a - >) (a :: k). f a -> <a href="#" title="Bug1050" + >} {a :: k}. f a -> <a href="#" title="Bug1050" >T</a > f a <a href="#" class="selflink" >#</a diff --git a/html-test/ref/Bug280.html b/html-test/ref/Bug280.html index 6a4aa63e..57e265f4 100644 --- a/html-test/ref/Bug280.html +++ b/html-test/ref/Bug280.html @@ -65,9 +65,9 @@ ><p class="src" ><a id="v:x" class="def" >x</a - > :: [<a href="#" title="Data.Char" - >Char</a - >] <a href="#" class="selflink" + > :: <a href="#" title="Data.String" + >String</a + > <a href="#" class="selflink" >#</a ></p ></div diff --git a/html-test/ref/Instances.html b/html-test/ref/Instances.html index 4ed71a4b..c6a6b5ca 100644 --- a/html-test/ref/Instances.html +++ b/html-test/ref/Instances.html @@ -594,11 +594,7 @@ ></span > <a href="#" title="Instances" >Foo</a - > ((->) a :: <a href="#" title="Data.Kind" - >Type</a - > -> <a href="#" title="Data.Kind" - >Type</a - >)</span + > ((->) a)</span > <a href="#" class="selflink" >#</a ></td diff --git a/html-test/ref/SectionLabels.html b/html-test/ref/SectionLabels.html index 4581082e..8b571b42 100644 --- a/html-test/ref/SectionLabels.html +++ b/html-test/ref/SectionLabels.html @@ -1,4 +1,3 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" ><head ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" diff --git a/html-test/run b/html-test/run index 3e72be80..c14ab7b5 100755 --- a/html-test/run +++ b/html-test/run @@ -3,4 +3,5 @@ export HADDOCK_PATH=$(which haddock) LIB_PATH="$(dirname "$BASH_SOURCE")/../haddock-test/src/" MAIN_PATH="$(dirname "$BASH_SOURCE")/Main.hs" -runhaskell -i:"$LIB_PATH" $MAIN_PATH $@ +if [ -z "$RUNHASKELL" ]; then RUNHASKELL=runhaskell; fi +$RUNHASKELL -i:"$LIB_PATH" $MAIN_PATH $@ diff --git a/html-test/src/Bug679.hs b/html-test/src/Bug679.hs index dba194c4..0a321ec5 100644 --- a/html-test/src/Bug679.hs +++ b/html-test/src/Bug679.hs @@ -13,7 +13,7 @@ $(do let methodN = mkName "foo" methodTy <- [t| $(varT a) -> $(varT a) |] - let cla = ClassD [] classN [PlainTV a] [] [SigD methodN methodTy] + let cla = ClassD [] classN [PlainTV a ()] [] [SigD methodN methodTy] -- Note that we are /reusing/ the same type variable 'a' as in the class instanceHead <- [t| $(conT classN) (Bar $(varT a)) |] diff --git a/html-test/src/FunArgs.hs b/html-test/src/FunArgs.hs index 24e1ccff..e20bcda7 100644 --- a/html-test/src/FunArgs.hs +++ b/html-test/src/FunArgs.hs @@ -22,7 +22,7 @@ h :: forall a b c -> b -- ^ Second argument -> c -- ^ Third argument -> forall d. d -- ^ Result -h = undefined +h _ _ _ = undefined i :: forall a (b :: ()) d. (d ~ '()) |