From bf07847e45356024e10d1a325f015ac53544ea85 Mon Sep 17 00:00:00 2001
From: Alec Theriault <alec.theriault@gmail.com>
Date: Thu, 31 Jan 2019 12:43:39 -0800
Subject: 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
---
 hypsrc-test/ref/src/Records.html | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'hypsrc-test/ref/src/Records.html')

diff --git a/hypsrc-test/ref/src/Records.html b/hypsrc-test/ref/src/Records.html
index bc99cc56..5057b8a4 100644
--- a/hypsrc-test/ref/src/Records.html
+++ b/hypsrc-test/ref/src/Records.html
@@ -229,7 +229,7 @@
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043799"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >x :: Int
@@ -242,7 +242,7 @@
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043798"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >y :: Int
@@ -420,7 +420,7 @@
       >=</span
       ><span
       > </span
-      ><span id="local-6989586621679043795"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >Int
@@ -450,7 +450,7 @@
       >=</span
       ><span
       > </span
-      ><span id="local-6989586621679043794"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >Int
@@ -615,7 +615,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       >{</span
       ><span
       > </span
-      ><span id="local-6989586621679043790"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >Int
@@ -632,7 +632,7 @@ x :: Point -&gt; Int
       >,</span
       ><span
       > </span
-      ><span id="local-6989586621679043789"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >Int
@@ -812,7 +812,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043786"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >p :: Point
@@ -825,7 +825,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043785"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >d :: Int
@@ -935,7 +935,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043784"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >p :: Point
@@ -948,7 +948,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043783"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >d :: Int
@@ -1118,7 +1118,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043781"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >x :: Int
@@ -1131,7 +1131,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043780"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >y :: Int
@@ -1144,7 +1144,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043779"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >p :: Point
@@ -1204,7 +1204,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       >    </span
       ><span class="hs-special"
       >(</span
-      ><span id="local-6989586621679043777"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >dx :: Int
@@ -1219,7 +1219,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       >,</span
       ><span
       > </span
-      ><span id="local-6989586621679043776"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >dy :: Int
@@ -1271,7 +1271,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ></span
       ><span
       >    </span
-      ><span id="local-6989586621679043778"
+      ><span id=""
       ><span class="annot"
 	><span class="annottext"
 	  >aux :: Point -&gt; Point
@@ -1284,8 +1284,8 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
 	></span
       ><span
       > </span
-      ><span id="local-6989586621679043774"
-      ><span id="local-6989586621679043775"
+      ><span id=""
+      ><span id=""
 	><span class="annot"
 	  ><a href="Records.html#Point"
 	    ><span class="hs-identifier hs-type"
-- 
cgit v1.2.3