Merge remote-tracking branch 'upstream/main'

8 files changed, 52 insertions, 60 deletions

diff --git a/hypsrc-test/Main.hs b/hypsrc-test/Main.hs
index f7614927..e7afb61c 100644
--- a/hypsrc-test/Main.hs
+++ b/hypsrc-test/Main.hs
@@ -2,7 +2,7 @@
 
 
 import Data.Char
-import Data.List
+import Data.List (isPrefixOf)
 import Data.Function (on)
 
 import System.Environment
diff --git a/hypsrc-test/ref/src/Classes.html b/hypsrc-test/ref/src/Classes.html
index 688b6db6..4b0343cf 100644
--- a/hypsrc-test/ref/src/Classes.html
+++ b/hypsrc-test/ref/src/Classes.html
@@ -194,7 +194,7 @@
 	><span class="annottext"
 	  >bar :: Int -&gt; Int
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#bar"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >bar</span
 	    ></a
@@ -226,7 +226,7 @@ forall a. a -&gt; a
 	><span class="annottext"
 	  >baz :: Int -&gt; (Int, Int)
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#baz"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >baz</span
 	    ></a
@@ -327,7 +327,7 @@ forall a. a -&gt; a
 	><span class="annottext"
 	  >bar :: [a] -&gt; Int
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#bar"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >bar</span
 	    ></a
@@ -342,6 +342,7 @@ forall a. a -&gt; a
       ><span class="annot"
       ><span class="annottext"
 	>[a] -&gt; Int
+forall a. [a] -&gt; Int
 forall (t :: * -&gt; *) a. Foldable t =&gt; t a -&gt; Int
 </span
 	><span class="hs-identifier hs-var"
@@ -359,7 +360,7 @@ forall (t :: * -&gt; *) a. Foldable t =&gt; t a -&gt; Int
 	><span class="annottext"
 	  >baz :: Int -&gt; ([a], [a])
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#baz"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >baz</span
 	    ></a
@@ -716,6 +717,7 @@ forall b c a. (b -&gt; c) -&gt; (a -&gt; b) -&gt; a -&gt; c
 	><span class="annot"
 	><span class="annottext"
 	  >[Int] -&gt; Int
+forall a. Num a =&gt; [a] -&gt; a
 forall (t :: * -&gt; *) a. (Foldable t, Num a) =&gt; t a -&gt; a
 </span
 	  ><span class="hs-identifier hs-var"
@@ -798,7 +800,7 @@ forall a. Foo a =&gt; a -&gt; Int
 	><span class="annottext"
 	  >norf :: [Int] -&gt; Int
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#norf"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >norf</span
 	    ></a
@@ -813,6 +815,7 @@ forall a. Foo a =&gt; a -&gt; Int
       ><span class="annot"
       ><span class="annottext"
 	>[Int] -&gt; Int
+forall a. Num a =&gt; [a] -&gt; a
 forall (t :: * -&gt; *) a. (Foldable t, Num a) =&gt; t a -&gt; a
 </span
 	><span class="hs-identifier hs-var"
@@ -870,7 +873,7 @@ forall (t :: * -&gt; *) a. (Foldable t, Num a) =&gt; t a -&gt; a
 	><span class="annottext"
 	  >quux :: ([a], [a]) -&gt; [a]
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#quux"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >quux</span
 	    ></a
@@ -1118,7 +1121,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 	><span class="annottext"
 	  >plugh :: forall a b. Either a a -&gt; Either b b -&gt; Either (a -&gt; b) (b -&gt; a)
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#plugh"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >plugh</span
 	    ></a
diff --git a/hypsrc-test/ref/src/Constructors.html b/hypsrc-test/ref/src/Constructors.html
index d5c3dd33..e3bb22d8 100644
--- a/hypsrc-test/ref/src/Constructors.html
+++ b/hypsrc-test/ref/src/Constructors.html
@@ -1309,6 +1309,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span class="annot"
       ><span class="annottext"
 	>[Int] -&gt; Int
+forall a. Num a =&gt; [a] -&gt; a
 forall (t :: * -&gt; *) a. (Foldable t, Num a) =&gt; t a -&gt; a
 </span
 	><span class="hs-identifier hs-var"
diff --git a/hypsrc-test/ref/src/Operators.html b/hypsrc-test/ref/src/Operators.html
index 04006a0d..8519d9de 100644
--- a/hypsrc-test/ref/src/Operators.html
+++ b/hypsrc-test/ref/src/Operators.html
@@ -33,11 +33,6 @@
 </span
       ><span id="line-4"
       ></span
-      ><span
-      >
-</span
-      ><span id="line-5"
-      ></span
       ><span id=""
       ><span class="annot"
 	><a href="Operators.html#%2B%2B%2B"
@@ -97,7 +92,7 @@
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id="line-5"
       ></span
       ><span id=""
       ><span class="annot"
@@ -196,12 +191,12 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id="line-6"
       ></span
       ><span
       >
 </span
-      ><span id="line-8"
+      ><span id="line-7"
       ></span
       ><span id=""
       ><span class="annot"
@@ -262,7 +257,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-9"
+      ><span id="line-8"
       ></span
       ><span id=""
       ><span class="annot"
@@ -342,12 +337,12 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-10"
+      ><span id="line-9"
       ></span
       ><span
       >
 </span
-      ><span id="line-11"
+      ><span id="line-10"
       ></span
       ><span id=""
       ><span class="annot"
@@ -408,7 +403,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-12"
+      ><span id="line-11"
       ></span
       ><span id="%2A%2A%2A"
       ><span class="annot"
@@ -458,7 +453,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-13"
+      ><span id="line-12"
       ></span
       ><span class="annot"
       ><a href="Operators.html#%2A%2A%2A"
@@ -575,12 +570,12 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-14"
+      ><span id="line-13"
       ></span
       ><span
       >
 </span
-      ><span id="line-15"
+      ><span id="line-14"
       ></span
       ><span id=""
       ><span class="annot"
@@ -645,7 +640,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-16"
+      ><span id="line-15"
       ></span
       ><span id=""
       ><span class="annot"
@@ -739,12 +734,12 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-17"
+      ><span id="line-16"
       ></span
       ><span
       >
 </span
-      ><span id="line-18"
+      ><span id="line-17"
       ></span
       ><span id=""
       ><span class="annot"
@@ -817,7 +812,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-19"
+      ><span id="line-18"
       ></span
       ><span id=""
       ><span class="annot"
@@ -961,17 +956,12 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-20"
-      ></span
-      ><span
-      >
-</span
-      ><span id="line-21"
+      ><span id="line-19"
       ></span
       ><span
       >
 </span
-      ><span id="line-22"
+      ><span id="line-20"
       ></span
       ><span id=""
       ><span id=""
@@ -1054,7 +1044,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       >
 </span
-      ><span id="line-23"
+      ><span id="line-21"
       ></span
       ><span id=""
       ><span class="annot"
@@ -1109,16 +1099,6 @@ forall a b. a -&gt; b -&gt; a
 	></span
       ><span
       > </span
-      ><span class="annot"
-      ><span class="annottext"
-	>((a, b) -&gt; c -&gt; (a, b)) -&gt; (a, b) -&gt; c -&gt; (a, b)
-forall a b. (a -&gt; b) -&gt; a -&gt; b
-</span
-	><span class="hs-operator hs-var"
-	>$</span
-	></span
-      ><span
-      > </span
       ><span class="hs-special"
       >(</span
       ><span class="annot"
@@ -1148,7 +1128,7 @@ forall a b. (a -&gt; b) -&gt; a -&gt; b
       ><span
       >
 </span
-      ><span id="line-24"
+      ><span id="line-22"
       ></span
       ></pre
     ></body
diff --git a/hypsrc-test/ref/src/Quasiquoter.html b/hypsrc-test/ref/src/Quasiquoter.html
index 53c05de1..76faac5a 100644
--- a/hypsrc-test/ref/src/Quasiquoter.html
+++ b/hypsrc-test/ref/src/Quasiquoter.html
@@ -80,8 +80,10 @@
 </span
       ><span id="line-7"
       ></span
+      ><span class="annot"
       ><span class="hs-comment"
-      >-- | Quoter for constructing multiline string literals</span
+	>-- | Quoter for constructing multiline string literals</span
+	></span
       ><span
       >
 </span
@@ -156,6 +158,7 @@
       ><span class="annot"
       ><span class="annottext"
 	>Exp -&gt; Q Exp
+forall a. a -&gt; Q a
 forall (f :: * -&gt; *) a. Applicative f =&gt; a -&gt; f a
 </span
 	><span class="hs-identifier hs-var"
@@ -398,6 +401,7 @@ forall a. String -&gt; Q a
       ><span class="annot"
       ><span class="annottext"
 	>String -&gt; Q a
+forall a. String -&gt; Q a
 forall (m :: * -&gt; *) a. MonadFail m =&gt; String -&gt; m a
 </span
 	><span class="hs-identifier hs-var"
diff --git a/hypsrc-test/ref/src/Records.html b/hypsrc-test/ref/src/Records.html
index 9adf02de..256b952f 100644
--- a/hypsrc-test/ref/src/Records.html
+++ b/hypsrc-test/ref/src/Records.html
@@ -623,10 +623,10 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span class="annot"
 	><span class="annottext"
 	  >Int
-x :: Int
 x :: Point -&gt; Int
+x :: Int
 </span
-	  ><a href="#"
+	  ><a href="Records.html#x"
 	  ><span class="hs-identifier hs-var hs-var"
 	    >x</span
 	    ></a
@@ -640,10 +640,10 @@ x :: Point -&gt; Int
       ><span class="annot"
 	><span class="annottext"
 	  >Int
-y :: Int
 y :: Point -&gt; Int
+y :: Int
 </span
-	  ><a href="#"
+	  ><a href="Records.html#y"
 	  ><span class="hs-identifier hs-var hs-var"
 	    >y</span
 	    ></a
@@ -1301,12 +1301,12 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
 	><span class="annot"
 	  ><span class="annottext"
 	    >Int
-y :: Int
-x :: Int
-y :: Point -&gt; Int
 x :: Point -&gt; Int
+y :: Point -&gt; Int
+x :: Int
+y :: Int
 </span
-	    ><a href="#"
+	    ><a href="Records.html#x"
 	    ><span class="hs-glyph hs-var hs-var hs-var hs-var"
 	      >..</span
 	      ></a
diff --git a/hypsrc-test/ref/src/UsingQuasiquotes.html b/hypsrc-test/ref/src/UsingQuasiquotes.html
index 1e7aef2c..b3ce68ec 100644
--- a/hypsrc-test/ref/src/UsingQuasiquotes.html
+++ b/hypsrc-test/ref/src/UsingQuasiquotes.html
@@ -78,7 +78,10 @@
       ><span
       > </span
       ><span class="annot"
-      ><span class=""
+      ><span class="annottext"
+	>[Char]
+</span
+	><span class=""
 	>[string| foo bar |]</span
 	></span
       ><span
@@ -94,7 +97,10 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span
       > </span
       ><span class="annot"
-      ><span class=""
+      ><span class="annottext"
+	>[Char]
+</span
+	><span class=""
 	>[string| some
   mulitline
   quasiquote
diff --git a/hypsrc-test/src/Operators.hs b/hypsrc-test/src/Operators.hs
index 1dcb8856..82c4da04 100644
--- a/hypsrc-test/src/Operators.hs
+++ b/hypsrc-test/src/Operators.hs
@@ -1,7 +1,6 @@
 {-# LANGUAGE Haskell2010 #-}
 module Operators where
 
-
 (+++) :: [a] -> [a] -> [a]
 a +++ b = a ++ b ++ a
 
@@ -18,6 +17,5 @@ a */\* b = concatMap (*** b) a
 (**/\**) :: [[a]] -> [[a]] -> [[a]]
 a **/\** b = zipWith (*/\*) [a +++ b] (a $$$ b)
 
-
 (#.#) :: a -> b -> (c -> (a, b))
-a #.# b = const $ (a, b)
+a #.# b = const (a, b)