diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2020-05-29 22:51:26 +0000 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-06-03 17:02:31 -0400 |
| commit | 792b82861a8abd03579a281dfdcbbb7081668997 (patch) | |
| tree | 427aa9125eb08fd4cb57970d2ab51940d8551383 | |
| parent | 60c85324ae083e2ac3d6180c0f20db5cdb31168b (diff) | |
testsuite: Update expected output for simplified subsumption
| -rw-r--r-- | html-test/ref/Bug280.html | 6 | ||||
| -rw-r--r-- | html-test/src/FunArgs.hs | 2 | ||||
| -rw-r--r-- | hypsrc-test/ref/src/Classes.html | 2 | ||||
| -rw-r--r-- | hypsrc-test/ref/src/Literals.html | 6 | ||||
| -rw-r--r-- | hypsrc-test/ref/src/Operators.html | 12 | ||||
| -rw-r--r-- | hypsrc-test/ref/src/Polymorphism.html | 36 |
6 files changed, 32 insertions, 32 deletions
diff --git a/html-test/ref/Bug280.html b/html-test/ref/Bug280.html index b6994e7c..04571342 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/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 ~ '()) diff --git a/hypsrc-test/ref/src/Classes.html b/hypsrc-test/ref/src/Classes.html index 48218a32..3477d89d 100644 --- a/hypsrc-test/ref/src/Classes.html +++ b/hypsrc-test/ref/src/Classes.html @@ -1109,7 +1109,7 @@ forall a. [a] -> [a] -> [a] ><span id="" ><span class="annot" ><span class="annottext" - >plugh :: Either a a -> Either b b -> Either (a -> b) (b -> a) + >plugh :: forall a b. Either a a -> Either b b -> Either (a -> b) (b -> a) </span ><a href="#" ><span class="hs-identifier hs-var hs-var hs-var hs-var" diff --git a/hypsrc-test/ref/src/Literals.html b/hypsrc-test/ref/src/Literals.html index 0c7ddf9e..db6d37b3 100644 --- a/hypsrc-test/ref/src/Literals.html +++ b/hypsrc-test/ref/src/Literals.html @@ -132,7 +132,7 @@ ><span id="num" ><span class="annot" ><span class="annottext" - >num :: a + >num :: forall a. Num a => a </span ><a href="Literals.html#num" ><span class="hs-identifier hs-var hs-var" @@ -285,7 +285,7 @@ forall a. Num a => a -> a -> a ><span id="frac" ><span class="annot" ><span class="annottext" - >frac :: a + >frac :: forall a. Fractional a => a </span ><a href="Literals.html#frac" ><span class="hs-identifier hs-var hs-var" @@ -360,7 +360,7 @@ forall a. Num a => a -> a -> a ><span id="list" ><span class="annot" ><span class="annottext" - >list :: [[[[a]]]] + >list :: forall a. [[[[a]]]] </span ><a href="Literals.html#list" ><span class="hs-identifier hs-var hs-var" diff --git a/hypsrc-test/ref/src/Operators.html b/hypsrc-test/ref/src/Operators.html index 289684a0..2ce87a6e 100644 --- a/hypsrc-test/ref/src/Operators.html +++ b/hypsrc-test/ref/src/Operators.html @@ -108,7 +108,7 @@ ><span id="%2B%2B%2B" ><span class="annot" ><span class="annottext" - >+++ :: [a] -> [a] -> [a] + >+++ :: forall a. [a] -> [a] -> [a] </span ><a href="Operators.html#%2B%2B%2B" ><span class="hs-operator hs-var hs-var" @@ -273,7 +273,7 @@ forall a. [a] -> [a] -> [a] ><span id="%24%24%24" ><span class="annot" ><span class="annottext" - >$$$ :: [a] -> [a] -> [a] + >$$$ :: forall a. [a] -> [a] -> [a] </span ><a href="Operators.html#%24%24%24" ><span class="hs-operator hs-var hs-var" @@ -406,7 +406,7 @@ forall a. [a] -> [a] -> [a] ><span id="%2A%2A%2A" ><span class="annot" ><span class="annottext" - >*** :: [a] -> [a] -> [a] + >*** :: forall a. [a] -> [a] -> [a] </span ><a href="Operators.html#%2A%2A%2A" ><span class="hs-operator hs-var hs-var" @@ -656,7 +656,7 @@ forall a. [a] -> [a] -> [a] ><span id="%2A%2F%5C%2A" ><span class="annot" ><span class="annottext" - >*/\* :: [[a]] -> [a] -> [a] + >*/\* :: forall a. [[a]] -> [a] -> [a] </span ><a href="Operators.html#%2A%2F%5C%2A" ><span class="hs-operator hs-var hs-var" @@ -828,7 +828,7 @@ forall a. [a] -> [a] -> [a] ><span id="%2A%2A%2F%5C%2A%2A" ><span class="annot" ><span class="annottext" - >**/\** :: [[a]] -> [[a]] -> [[a]] + >**/\** :: forall a. [[a]] -> [[a]] -> [[a]] </span ><a href="Operators.html#%2A%2A%2F%5C%2A%2A" ><span class="hs-operator hs-var hs-var" @@ -1065,7 +1065,7 @@ forall a. [a] -> [a] -> [a] ><span id="%23.%23" ><span class="annot" ><span class="annottext" - >#.# :: a -> b -> c -> (a, b) + >#.# :: forall a b c. a -> b -> c -> (a, b) </span ><a href="Operators.html#%23.%23" ><span class="hs-operator hs-var hs-var" diff --git a/hypsrc-test/ref/src/Polymorphism.html b/hypsrc-test/ref/src/Polymorphism.html index 9f8a1850..1b166aff 100644 --- a/hypsrc-test/ref/src/Polymorphism.html +++ b/hypsrc-test/ref/src/Polymorphism.html @@ -107,7 +107,7 @@ ><span id="foo" ><span class="annot" ><span class="annottext" - >foo :: a -> a -> a + >foo :: forall a. a -> a -> a </span ><a href="Polymorphism.html#foo" ><span class="hs-identifier hs-var hs-var" @@ -205,7 +205,7 @@ forall a. HasCallStack => a ><span id="foo%27" ><span class="annot" ><span class="annottext" - >foo' :: a -> a -> a + >foo' :: forall a. a -> a -> a </span ><a href="Polymorphism.html#foo%27" ><span class="hs-identifier hs-var hs-var" @@ -305,7 +305,7 @@ forall a. HasCallStack => a ><span id="bar" ><span class="annot" ><span class="annottext" - >bar :: a -> b -> (a, b) + >bar :: forall a b. a -> b -> (a, b) </span ><a href="Polymorphism.html#bar" ><span class="hs-identifier hs-var hs-var" @@ -427,7 +427,7 @@ forall a. HasCallStack => a ><span id="bar%27" ><span class="annot" ><span class="annottext" - >bar' :: a -> b -> (a, b) + >bar' :: forall a b. a -> b -> (a, b) </span ><a href="Polymorphism.html#bar%27" ><span class="hs-identifier hs-var hs-var" @@ -557,7 +557,7 @@ forall a. HasCallStack => a ><span id="baz" ><span class="annot" ><span class="annottext" - >baz :: a -> (a -> [a -> a] -> b) -> b + >baz :: forall a b. a -> (a -> [a -> a] -> b) -> b </span ><a href="Polymorphism.html#baz" ><span class="hs-identifier hs-var hs-var" @@ -709,7 +709,7 @@ forall a. HasCallStack => a ><span id="baz%27" ><span class="annot" ><span class="annottext" - >baz' :: a -> (a -> [a -> a] -> b) -> b + >baz' :: forall a b. a -> (a -> [a -> a] -> b) -> b </span ><a href="Polymorphism.html#baz%27" ><span class="hs-identifier hs-var hs-var" @@ -825,7 +825,7 @@ forall a. HasCallStack => a ><span id="quux" ><span class="annot" ><span class="annottext" - >quux :: a -> (forall a. a -> a) -> a + >quux :: forall a. a -> (forall a. a -> a) -> a </span ><a href="Polymorphism.html#quux" ><span class="hs-identifier hs-var hs-var" @@ -994,7 +994,7 @@ forall a. a -> a ><span id="quux%27" ><span class="annot" ><span class="annottext" - >quux' :: a -> (forall a. a -> a) -> a + >quux' :: forall a. a -> (forall a. a -> a) -> a </span ><a href="Polymorphism.html#quux%27" ><span class="hs-identifier hs-var hs-var" @@ -1140,7 +1140,7 @@ forall a. a -> a ><span id="num" ><span class="annot" ><span class="annottext" - >num :: a -> a -> a + >num :: forall a. Num a => a -> a -> a </span ><a href="Polymorphism.html#num" ><span class="hs-identifier hs-var hs-var" @@ -1256,7 +1256,7 @@ forall a. HasCallStack => a ><span id="num%27" ><span class="annot" ><span class="annottext" - >num' :: a -> a -> a + >num' :: forall a. Num a => a -> a -> a </span ><a href="Polymorphism.html#num%27" ><span class="hs-identifier hs-var hs-var" @@ -1402,7 +1402,7 @@ forall a. HasCallStack => a ><span id="eq" ><span class="annot" ><span class="annottext" - >eq :: [a] -> [b] -> (a, b) + >eq :: forall a b. (Eq a, Eq b) => [a] -> [b] -> (a, b) </span ><a href="Polymorphism.html#eq" ><span class="hs-identifier hs-var hs-var" @@ -1570,7 +1570,7 @@ forall a. HasCallStack => a ><span id="eq%27" ><span class="annot" ><span class="annottext" - >eq' :: [a] -> [b] -> (a, b) + >eq' :: forall a b. (Eq a, Eq b) => [a] -> [b] -> (a, b) </span ><a href="Polymorphism.html#eq%27" ><span class="hs-identifier hs-var hs-var" @@ -1694,7 +1694,7 @@ forall a. HasCallStack => a ><span id="mon" ><span class="annot" ><span class="annottext" - >mon :: (a -> m a) -> m a + >mon :: forall (m :: * -> *) a. Monad m => (a -> m a) -> m a </span ><a href="Polymorphism.html#mon" ><span class="hs-identifier hs-var hs-var" @@ -1840,7 +1840,7 @@ forall a. HasCallStack => a ><span id="mon%27" ><span class="annot" ><span class="annottext" - >mon' :: (a -> m a) -> m a + >mon' :: forall (m :: * -> *) a. Monad m => (a -> m a) -> m a </span ><a href="Polymorphism.html#mon%27" ><span class="hs-identifier hs-var hs-var" @@ -1979,7 +1979,7 @@ forall a. HasCallStack => a ><span id="norf" ><span class="annot" ><span class="annottext" - >norf :: a -> (forall a. Ord a => a -> a) -> a + >norf :: forall a. a -> (forall a. Ord a => a -> a) -> a </span ><a href="Polymorphism.html#norf" ><span class="hs-identifier hs-var hs-var" @@ -2154,7 +2154,7 @@ forall a. HasCallStack => a ><span id="norf%27" ><span class="annot" ><span class="annottext" - >norf' :: a -> (forall a. Ord a => a -> a) -> a + >norf' :: forall a. a -> (forall a. Ord a => a -> a) -> a </span ><a href="Polymorphism.html#norf%27" ><span class="hs-identifier hs-var hs-var" @@ -2272,7 +2272,7 @@ forall a. HasCallStack => a ><span id="plugh" ><span class="annot" ><span class="annottext" - >plugh :: a -> a + >plugh :: forall a. a -> a </span ><a href="Polymorphism.html#plugh" ><span class="hs-identifier hs-var hs-var" @@ -2436,7 +2436,7 @@ forall a. HasCallStack => a ><span id="thud" ><span class="annot" ><span class="annottext" - >thud :: (a -> b) -> a -> (a, b) + >thud :: forall a b. (a -> b) -> a -> (a, b) </span ><a href="Polymorphism.html#thud" ><span class="hs-identifier hs-var hs-var" |