Merge remote-tracking branch 'origin/master' into ghc-head

1 files changed, 131 insertions, 22 deletions

diff --git a/html-test/ref/PatternSyns.html b/html-test/ref/PatternSyns.html
index 70e9230b..37596645 100644
--- a/html-test/ref/PatternSyns.html
+++ b/html-test/ref/PatternSyns.html
@@ -6,11 +6,11 @@
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
-    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ><script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ><script type="text/javascript"
     >//
-window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&quot;);};
+window.onload = function () {pageLoad();};
 //
 </script
     ></head
@@ -69,9 +69,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >Foo</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t. t -&gt; <a href="#"
+	    > x. x -&gt; <a href="#"
 	    >FooType</a
-	    > t</li
+	    > x</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >pattern</span
@@ -79,11 +79,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >Bar</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t. t -&gt; <a href="#"
+	    > x. x -&gt; <a href="#"
 	    >FooType</a
 	    > (<a href="#"
 	    >FooType</a
-	    > t)</li
+	    > x)</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >pattern</span
@@ -91,17 +91,41 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >(:&lt;-&gt;)</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t t1. t -&gt; t1 -&gt; (<a href="#"
+	    > x x1. x -&gt; x1 -&gt; (<a href="#"
 	    >FooType</a
-	    > t, <a href="#"
+	    > x, <a href="#"
 	    >FooType</a
 	    > (<a href="#"
 	    >FooType</a
-	    > t1))</li
+	    > x1))</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a href="#"
+	    > <a href="#"
+	    >BlubType</a
+	    > = <a href="#"
+	    >Show</a
+	    > x =&gt; <a href="#"
+	    >BlubCtor</a
+	    > x</li
+	  ><li class="src short"
+	  ><span class="keyword"
+	    >pattern</span
+	    > <a href="#"
+	    >Blub</a
+	    > :: () =&gt; <span class="keyword"
+	    >forall</span
+	    > x. <a href="#"
+	    >Show</a
+	    > x =&gt; x -&gt; <a href="#"
+	    >BlubType</a
+	    ></li
+	  ><li class="src short"
+	  ><span class="keyword"
+	    >data</span
+	    > (a :: <a href="#"
+	    >*</a
+	    >) <a href="#"
 	    >&gt;&lt;</a
 	    > b = <a href="#"
 	    >Empty</a
@@ -113,9 +137,19 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >E</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > k t t1. <a href="#"
+	    > k a (b :: k). <a href="#"
 	    >(&gt;&lt;)</a
-	    > k t t1</li
+	    > k a b</li
+	  ><li class="src short"
+	  ><span class="keyword"
+	    >pattern</span
+	    > <a href="#"
+	    >PatWithExplicitSig</a
+	    > :: <a href="#"
+	    >Eq</a
+	    > somex =&gt; somex -&gt; <a href="#"
+	    >FooType</a
+	    > somex</li
 	  ></ul
 	></div
       ><div id="interface"
@@ -157,9 +191,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >Foo</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t. t -&gt; <a href="#"
+	    > x. x -&gt; <a href="#"
 	    >FooType</a
-	    > t <a href="#" class="selflink"
+	    > x <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -179,11 +213,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >Bar</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t. t -&gt; <a href="#"
+	    > x. x -&gt; <a href="#"
 	    >FooType</a
 	    > (<a href="#"
 	    >FooType</a
-	    > t) <a href="#" class="selflink"
+	    > x) <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -203,13 +237,13 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >(:&lt;-&gt;)</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > t t1. t -&gt; t1 -&gt; (<a href="#"
+	    > x x1. x -&gt; x1 -&gt; (<a href="#"
 	    >FooType</a
-	    > t, <a href="#"
+	    > x, <a href="#"
 	    >FooType</a
 	    > (<a href="#"
 	    >FooType</a
-	    > t1)) <a href="#" class="selflink"
+	    > x1)) <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -225,7 +259,63 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a id="t:-62--60-" class="def"
+	    > <a id="t:BlubType" class="def"
+	    >BlubType</a
+	    > <a href="#" class="selflink"
+	    >#</a
+	    ></p
+	  ><div class="doc"
+	  ><p
+	    >BlubType is existentially quantified</p
+	    ></div
+	  ><div class="subs constructors"
+	  ><p class="caption"
+	    >Constructors</p
+	    ><table
+	    ><tr
+	      ><td class="src"
+		><a href="#"
+		  >Show</a
+		  > x =&gt; <a id="v:BlubCtor" class="def"
+		  >BlubCtor</a
+		  > x</td
+		><td class="doc empty"
+		></td
+		></tr
+	      ></table
+	    ></div
+	  ></div
+	><div class="top"
+	><p class="src"
+	  ><span class="keyword"
+	    >pattern</span
+	    > <a id="v:Blub" class="def"
+	    >Blub</a
+	    > :: () =&gt; <span class="keyword"
+	    >forall</span
+	    > x. <a href="#"
+	    >Show</a
+	    > x =&gt; x -&gt; <a href="#"
+	    >BlubType</a
+	    > <a href="#" class="selflink"
+	    >#</a
+	    ></p
+	  ><div class="doc"
+	  ><p
+	    >Pattern synonym for <code
+	      ><a href="#"
+		>Blub</a
+		></code
+	      > x</p
+	    ></div
+	  ></div
+	><div class="top"
+	><p class="src"
+	  ><span class="keyword"
+	    >data</span
+	    > (a :: <a href="#"
+	    >*</a
+	    >) <a id="t:-62--60-" class="def"
 	    >&gt;&lt;</a
 	    > b <a href="#" class="selflink"
 	    >#</a
@@ -261,9 +351,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >E</a
 	    > :: <span class="keyword"
 	    >forall</span
-	    > k t t1. <a href="#"
+	    > k a (b :: k). <a href="#"
 	    >(&gt;&lt;)</a
-	    > k t t1 <a href="#" class="selflink"
+	    > k a b <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -275,6 +365,25 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	      ></p
 	    ></div
 	  ></div
+	><div class="top"
+	><p class="src"
+	  ><span class="keyword"
+	    >pattern</span
+	    > <a id="v:PatWithExplicitSig" class="def"
+	    >PatWithExplicitSig</a
+	    > :: <a href="#"
+	    >Eq</a
+	    > somex =&gt; somex -&gt; <a href="#"
+	    >FooType</a
+	    > somex <a href="#" class="selflink"
+	    >#</a
+	    ></p
+	  ><div class="doc"
+	  ><p
+	    >Earlier ghc versions didn't allow explicit signatures
+ on pattern synonyms.</p
+	    ></div
+	  ></div
 	></div
       ></div
     ><div id="footer"