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

diff --git a/hypsrc-test/ref/src/ClangCppBug.html b/hypsrc-test/ref/src/ClangCppBug.html
index 42d0cfc0..d03c92e1 100644
--- a/hypsrc-test/ref/src/ClangCppBug.html
+++ b/hypsrc-test/ref/src/ClangCppBug.html
@@ -11,7 +11,7 @@
       ><span
       >
 </span
-      ><span id="line-2"
+      ><span id=""
       ></span
       ><span class="hs-keyword"
       >module</span
@@ -26,12 +26,12 @@
       ><span
       >
 </span
-      ><span id="line-3"
+      ><span id=""
       ></span
       ><span
       >
 </span
-      ><span id="line-4"
+      ><span id=""
       ></span
       ><span class="annot"
       ><a href="ClangCppBug.html#foo"
@@ -52,7 +52,7 @@
       ><span
       >
 </span
-      ><span id="line-5"
+      ><span id=""
       ></span
       ><span id="foo"
       ><span class="annot"
@@ -78,12 +78,12 @@
       ><span
       >
 </span
-      ><span id="line-6"
+      ><span id=""
       ></span
       ><span
       >
 </span
-      ><span id="line-7"
+      ><span id=""
       ></span
       ><span class="hs-comment"
       >-- Clang doesn't mind these:</span
@@ -108,12 +108,12 @@
       ><span
       >
 </span
-      ><span id="line-10"
+      ><span id=""
       ></span
       ><span
       >
 </span
-      ><span id="line-11"
+      ><span id=""
       ></span
       ><span class="annot"
       ><a href="ClangCppBug.html#bar"
@@ -134,7 +134,7 @@
       ><span
       >
 </span
-      ><span id="line-12"
+      ><span id=""
       ></span
       ><span id="bar"
       ><span class="annot"
@@ -160,26 +160,26 @@
       ><span
       >
 </span
-      ><span id="line-13"
+      ><span id=""
       ></span
       ><span
       >
 </span
-      ><span id="line-14"
+      ><span id=""
       ></span
       ><span class="hs-comment"
       >-- But it doesn't like this:</span
       ><span
       >
 </span
-      ><span id="line-15"
+      ><span id=""
       ></span
       ><span class="hs-pragma"
       >{-# RULES</span
       ><span
       >
 </span
-      ><span id="line-16"
+      ><span id=""
       ></span
       ><span class="annot"
       ><span class="hs-pragma"
@@ -208,7 +208,7 @@
       ><span
       >
 </span
-      ><span id="line-17"
+      ><span id=""
       ></span
       ><span class="annot"
       ><span class="hs-pragma"
@@ -237,7 +237,7 @@
       ><span
       >
 </span
-      ><span id="line-18"
+      ><span id=""
       ></span
       ><span
       >  </span
@@ -246,12 +246,12 @@
       ><span
       >
 </span
-      ><span id="line-20"
+      ><span id=""
       ></span
       ><span
       >
 </span
-      ><span id="line-21"
+      ><span id=""
       ></span
       ><span class="annot"
       ><a href="ClangCppBug.html#qux"
@@ -272,7 +272,7 @@
       ><span
       >
 </span
-      ><span id="line-22"
+      ><span id=""
       ></span
       ><span id="qux"
       ><span class="annot"
@@ -298,7 +298,7 @@
       ><span
       >
 </span
-      ><span id="line-23"
+      ><span id=""
       ></span
       ></pre
     ></body