From 52103425e6d621523fb0ed5b5b83c2588cacc7b6 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 3 Apr 2014 21:13:48 +0100 Subject: Update test cases for GHC bug #8945, Haddock #188 The order of signature groups has been corrected upstream. Here we add a test case and update some existing test-cases to reflect this change. We remove grouped signature in test cases that we can (Minimal, BugDeprecated &c) so that the test is as self-contained as possible. --- html-test/ref/Bug188.html | 81 ++++++++++++++++++++++++++++++++++++++++ html-test/ref/BugDeprecated.html | 38 +++++++++---------- html-test/ref/Minimal.html | 64 +++++++++++++++++++++---------- html-test/ref/Operators.html | 14 +++---- html-test/src/Bug188.hs | 7 ++++ html-test/src/BugDeprecated.hs | 14 +++++-- html-test/src/Minimal.hs | 25 ++++++++++--- 7 files changed, 186 insertions(+), 57 deletions(-) create mode 100644 html-test/ref/Bug188.html create mode 100644 html-test/src/Bug188.hs diff --git a/html-test/ref/Bug188.html b/html-test/ref/Bug188.html new file mode 100644 index 00000000..3e9f4eec --- /dev/null +++ b/html-test/ref/Bug188.html @@ -0,0 +1,81 @@ + +Bug188

 

Safe HaskellSafe-Inferred

Bug188

Documentation

class A a where

Methods

f, g, h, i :: a -> ()

diff --git a/html-test/ref/BugDeprecated.html b/html-test/ref/BugDeprecated.html index 2ff23494..69521b95 100644 --- a/html-test/ref/BugDeprecated.html +++ b/html-test/ref/BugDeprecated.html @@ -53,13 +53,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");} >
  • bazbar :: Int
  • barbaz :: Int
  • threetwo :: Int
  • twothree :: Int

    • bazbar :: Int

    Deprecated: for baz

    Deprecated: for bar

    barbaz :: Int

    Deprecated: for bar

    Deprecated: for baz

    Deprecated: for one

    some documentation for one, two and three

    some documentation for one

    threetwo :: Int

    Deprecated: for three

    Deprecated: for two

    some documentation for one, two and three

    twothree :: Int

    Deprecated: for two

    Deprecated: for three

    some documentation for one, two and three

    foo, bat, bar :: a

    Any two of these are required...

    bar :: a

    bat :: a

    fooBarBat :: (a, a, a)

    a, g, f, e, d, c, :: a

    b :: a

    c :: a

    d :: a

    e :: a

    f :: a

    g :: a

    x, z, :: a

    y :: a

    z :: a

    aaa, :: a

    bbb :: a

    eee, :: a

    fff :: a

    (**>), (<**)(**<), (>**), (**<)(<**) :: a -> a -> ()

    (**>), (<**), (>**), (**<), (>**), (<**) :: a -> a -> () infixr 8 **>, >**infixl 8 <**, **<infixl 8 **<, <**

    () diff --git a/html-test/src/BugDeprecated.hs b/html-test/src/BugDeprecated.hs index 0f7ac2eb..7741786f 100644 --- a/html-test/src/BugDeprecated.hs +++ b/html-test/src/BugDeprecated.hs @@ -1,17 +1,25 @@ module BugDeprecated where -foo, bar, baz :: Int +foo :: Int foo = 23 + +bar :: Int bar = 23 + +baz :: Int baz = 23 {-# DEPRECATED foo "for foo" #-} {-# DEPRECATED bar "for bar" #-} {-# DEPRECATED baz "for baz" #-} --- | some documentation for one, two and three -one, two, three :: Int +-- | some documentation for one +one :: Int one = 23 + +two :: Int two = 23 + +three :: Int three = 23 {-# DEPRECATED one "for one" #-} {-# DEPRECATED two "for two" #-} diff --git a/html-test/src/Minimal.hs b/html-test/src/Minimal.hs index cd2df930..9df03cca 100644 --- a/html-test/src/Minimal.hs +++ b/html-test/src/Minimal.hs @@ -10,7 +10,9 @@ module Minimal class Foo a where -- | Any two of these are required... - foo, bar, bat :: a + foo :: a + bar :: a + bat :: a -- | .. or just this fooBarBat :: (a,a,a) @@ -18,23 +20,34 @@ class Foo a where {-# MINIMAL (foo, bar) | (bar, bat) | (foo, bat) | fooBarBat #-} class Weird a where - a,b,c,d,e,f,g :: a + a :: a + b :: a + c :: a + d :: a + e :: a + f :: a + g :: a {-# MINIMAL ((a, b), c | (d | (e, (f | g)))) #-} class NoMins a where - x,y,z :: a + x :: a + y :: a + z :: a -- | Has a default implementation! z = x class FullMin a where - aaa,bbb :: a + aaa :: a + bbb :: a class PartialMin a where - ccc,ddd :: a + ccc :: a + ddd :: a class EmptyMin a where - eee,fff :: a + eee :: a + fff :: a eee = fff fff = undefined -- cgit v1.2.3