Fix some Hyperlinker test suite fallout

* Amend `ParserSpec` to match new Hyperlinker API
    - pass in compiler info
    - strip out null tokens

* Make `hypsrc-test` pass reliably
    - strip out `local-*` ids
    - strip out `line-*` ids from the `ClangCppBug` test
    - re-accept output

1 files changed, 43 insertions, 43 deletions

diff --git a/hypsrc-test/ref/src/Polymorphism.html b/hypsrc-test/ref/src/Polymorphism.html
index 91f8bd33..ec9c49e8 100644
--- a/hypsrc-test/ref/src/Polymorphism.html
+++ b/hypsrc-test/ref/src/Polymorphism.html
@@ -55,7 +55,7 @@
 </span
       ><span id="line-8"
       ></span
-      ><span id="local-6989586621679043738"
+      ><span id=""
       ><span class="annot"
 	><a href="Polymorphism.html#foo"
 	  ><span class="hs-identifier hs-type"
@@ -155,7 +155,7 @@ forall a. HasCallStack =&gt; a
       >forall</span
       ><span
       > </span
-      ><span id="local-6989586621679043734"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -237,8 +237,8 @@ forall a. HasCallStack =&gt; a
 </span
       ><span id="line-14"
       ></span
-      ><span id="local-6989586621679043732"
-      ><span id="local-6989586621679043733"
+      ><span id=""
+      ><span id=""
 	><span class="annot"
 	  ><a href="Polymorphism.html#bar"
 	    ><span class="hs-identifier hs-type"
@@ -353,7 +353,7 @@ forall a. HasCallStack =&gt; a
       >forall</span
       ><span
       > </span
-      ><span id="local-6989586621679043729"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -363,7 +363,7 @@ forall a. HasCallStack =&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043728"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -459,8 +459,8 @@ forall a. HasCallStack =&gt; a
 </span
       ><span id="line-20"
       ></span
-      ><span id="local-6989586621679043726"
-      ><span id="local-6989586621679043727"
+      ><span id=""
+      ><span id=""
 	><span class="annot"
 	  ><a href="Polymorphism.html#baz"
 	    ><span class="hs-identifier hs-type"
@@ -605,7 +605,7 @@ forall a. HasCallStack =&gt; a
       >forall</span
       ><span
       > </span
-      ><span id="local-6989586621679043723"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -615,7 +615,7 @@ forall a. HasCallStack =&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043722"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -741,7 +741,7 @@ forall a. HasCallStack =&gt; a
 </span
       ><span id="line-26"
       ></span
-      ><span id="local-6989586621679043721"
+      ><span id=""
       ><span class="annot"
 	><a href="Polymorphism.html#quux"
 	  ><span class="hs-identifier hs-type"
@@ -772,7 +772,7 @@ forall a. HasCallStack =&gt; a
 	>forall</span
 	><span
 	> </span
-	><span id="local-6989586621679043756"
+	><span id=""
 	><span class="annot"
 	  ><a href="#"
 	    ><span class="hs-identifier hs-type"
@@ -835,7 +835,7 @@ forall a. HasCallStack =&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043719"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >x :: a
@@ -848,7 +848,7 @@ forall a. HasCallStack =&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043718"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >f :: forall a. a -&gt; a
@@ -912,7 +912,7 @@ forall a. a -&gt; a
       >forall</span
       ><span
       > </span
-      ><span id="local-6989586621679043716"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -942,7 +942,7 @@ forall a. a -&gt; a
       >forall</span
       ><span
       > </span
-      ><span id="local-6989586621679043715"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -1004,7 +1004,7 @@ forall a. a -&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043714"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >x :: a
@@ -1017,7 +1017,7 @@ forall a. a -&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043713"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >f :: forall a. a -&gt; a
@@ -1070,7 +1070,7 @@ forall a. a -&gt; a
 </span
       ><span id="line-33"
       ></span
-      ><span id="local-6989586621679043712"
+      ><span id=""
       ><span class="annot"
 	><a href="Polymorphism.html#num"
 	  ><span class="hs-identifier hs-type"
@@ -1188,7 +1188,7 @@ forall a. HasCallStack =&gt; a
       >forall</span
       ><span
       > </span
-      ><span id="local-6989586621679043709"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -1288,8 +1288,8 @@ forall a. HasCallStack =&gt; a
 </span
       ><span id="line-39"
       ></span
-      ><span id="local-6989586621679043707"
-      ><span id="local-6989586621679043708"
+      ><span id=""
+      ><span id=""
 	><span class="annot"
 	  ><a href="Polymorphism.html#eq"
 	    ><span class="hs-identifier hs-type"
@@ -1450,7 +1450,7 @@ forall a. HasCallStack =&gt; a
       >forall</span
       ><span
       > </span
-      ><span id="local-6989586621679043704"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -1460,7 +1460,7 @@ forall a. HasCallStack =&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043703"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -1602,8 +1602,8 @@ forall a. HasCallStack =&gt; a
 </span
       ><span id="line-45"
       ></span
-      ><span id="local-6989586621679043701"
-      ><span id="local-6989586621679043702"
+      ><span id=""
+      ><span id=""
 	><span class="annot"
 	  ><a href="Polymorphism.html#mon"
 	    ><span class="hs-identifier hs-type"
@@ -1742,7 +1742,7 @@ forall a. HasCallStack =&gt; a
       >forall</span
       ><span
       > </span
-      ><span id="local-6989586621679043698"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -1752,7 +1752,7 @@ forall a. HasCallStack =&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043697"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -1877,7 +1877,7 @@ forall a. HasCallStack =&gt; a
 </span
       ><span id="line-52"
       ></span
-      ><span id="local-6989586621679043696"
+      ><span id=""
       ><span class="annot"
 	><a href="Polymorphism.html#norf"
 	  ><span class="hs-identifier hs-type"
@@ -1908,7 +1908,7 @@ forall a. HasCallStack =&gt; a
 	>forall</span
 	><span
 	> </span
-	><span id="local-6989586621679043743"
+	><span id=""
 	><span class="annot"
 	  ><a href="#"
 	    ><span class="hs-identifier hs-type"
@@ -1989,7 +1989,7 @@ forall a. HasCallStack =&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043694"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >x :: a
@@ -2002,7 +2002,7 @@ forall a. HasCallStack =&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043693"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >f :: forall a. Ord a =&gt; a -&gt; a
@@ -2054,7 +2054,7 @@ forall a. HasCallStack =&gt; a
       >forall</span
       ><span
       > </span
-      ><span id="local-6989586621679043691"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -2084,7 +2084,7 @@ forall a. HasCallStack =&gt; a
       >forall</span
       ><span
       > </span
-      ><span id="local-6989586621679043690"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -2164,7 +2164,7 @@ forall a. HasCallStack =&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043689"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >x :: a
@@ -2177,7 +2177,7 @@ forall a. HasCallStack =&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043688"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >f :: forall a. Ord a =&gt; a -&gt; a
@@ -2234,7 +2234,7 @@ forall a. HasCallStack =&gt; a
       >forall</span
       ><span
       > </span
-      ><span id="local-6989586621679043686"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -2282,7 +2282,7 @@ forall a. HasCallStack =&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043685"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >x :: a
@@ -2346,7 +2346,7 @@ forall a. HasCallStack =&gt; a
       >forall</span
       ><span
       > </span
-      ><span id="local-6989586621679043683"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -2356,7 +2356,7 @@ forall a. HasCallStack =&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043682"
+      ><span id=""
       ><span class="annot"
 	><a href="#"
 	  ><span class="hs-identifier hs-type"
@@ -2446,7 +2446,7 @@ forall a. HasCallStack =&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043681"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >f :: a -&gt; b
@@ -2459,7 +2459,7 @@ forall a. HasCallStack =&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043680"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >x :: a
@@ -2561,7 +2561,7 @@ forall a. HasCallStack =&gt; a
       ></span
       ><span
       >    </span
-      ><span id="local-6989586621679043679"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >y :: b