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, 21 insertions, 21 deletions

diff --git a/hypsrc-test/ref/src/Operators.html b/hypsrc-test/ref/src/Operators.html
index 403954cf..4d5693c2 100644
--- a/hypsrc-test/ref/src/Operators.html
+++ b/hypsrc-test/ref/src/Operators.html
@@ -31,7 +31,7 @@
 </span
       ><span id="line-4"
       ></span
-      ><span id="local-6989586621679043657"
+      ><span id=""
       ><span class="annot"
 	><a href="Operators.html#%2B%2B%2B"
 	  ><span class="hs-operator hs-type"
@@ -92,7 +92,7 @@
 </span
       ><span id="line-5"
       ></span
-      ><span id="local-6989586621679043655"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >a :: [a]
@@ -118,7 +118,7 @@
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043654"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >b :: [a]
@@ -196,7 +196,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 </span
       ><span id="line-7"
       ></span
-      ><span id="local-6989586621679043653"
+      ><span id=""
       ><span class="annot"
 	><a href="Operators.html#%24%24%24"
 	  ><span class="hs-operator hs-type"
@@ -257,7 +257,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 </span
       ><span id="line-8"
       ></span
-      ><span id="local-6989586621679043651"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >a :: [a]
@@ -283,7 +283,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043650"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >b :: [a]
@@ -342,7 +342,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 </span
       ><span id="line-10"
       ></span
-      ><span id="local-6989586621679043649"
+      ><span id=""
       ><span class="annot"
 	><a href="Operators.html#%2A%2A%2A"
 	  ><span class="hs-operator hs-type"
@@ -416,7 +416,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043647"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >a :: [a]
@@ -461,7 +461,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043646"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >a :: [a]
@@ -482,7 +482,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
       ><span class="hs-glyph hs-type"
 	>:</span
 	></span
-      ><span id="local-6989586621679043645"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >b :: [a]
@@ -570,7 +570,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 </span
       ><span id="line-14"
       ></span
-      ><span id="local-6989586621679043666"
+      ><span id=""
       ><span class="annot"
 	><a href="Operators.html#%2A%2F%5C%2A"
 	  ><span class="hs-operator hs-type"
@@ -635,7 +635,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 </span
       ><span id="line-15"
       ></span
-      ><span id="local-6989586621679043643"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >a :: [[a]]
@@ -661,7 +661,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043642"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >b :: [a]
@@ -734,7 +734,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 </span
       ><span id="line-17"
       ></span
-      ><span id="local-6989586621679043640"
+      ><span id=""
       ><span class="annot"
 	><a href="Operators.html#%2A%2A%2F%5C%2A%2A"
 	  ><span class="hs-operator hs-type"
@@ -807,7 +807,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 </span
       ><span id="line-18"
       ></span
-      ><span id="local-6989586621679043638"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >a :: [[a]]
@@ -833,7 +833,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043637"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >b :: [[a]]
@@ -961,9 +961,9 @@ forall a. [a] -&gt; [a] -&gt; [a]
 </span
       ><span id="line-21"
       ></span
-      ><span id="local-6989586621679043633"
-      ><span id="local-6989586621679043634"
-	><span id="local-6989586621679043635"
+      ><span id=""
+      ><span id=""
+	><span id=""
 	  ><span class="annot"
 	    ><a href="Operators.html#%23.%23"
 	      ><span class="hs-operator hs-type"
@@ -1044,7 +1044,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 </span
       ><span id="line-22"
       ></span
-      ><span id="local-6989586621679043631"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >a :: a
@@ -1070,7 +1070,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043630"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >b :: b