[commit: haddock] master: Fix broken tests for parsing and hyperlinking hash operators. (257e045)

git at git.haskell.org git at git.haskell.org
Wed Jul 8 08:42:37 UTC 2015


Repository : ssh://git@git.haskell.org/haddock

On branch  : master
Link       : http://git.haskell.org/haddock.git/commitdiff/257e0456854a0835bb9901b6d73c17f6f8d0d841

>---------------------------------------------------------------

commit 257e0456854a0835bb9901b6d73c17f6f8d0d841
Author: Łukasz Hanuszczak <lukasz.hanuszczak at gmail.com>
Date:   Thu Jul 2 17:18:12 2015 +0200

    Fix broken tests for parsing and hyperlinking hash operators.


>---------------------------------------------------------------

257e0456854a0835bb9901b6d73c17f6f8d0d841
 .../Haddock/Backends/Hyperlinker/ParserSpec.hs     |   2 +-
 hypsrc-test/ref/src/Operators.html                 | 122 +++++++++++++++++++++
 2 files changed, 123 insertions(+), 1 deletion(-)

diff --git a/haddock-api/test/Haddock/Backends/Hyperlinker/ParserSpec.hs b/haddock-api/test/Haddock/Backends/Hyperlinker/ParserSpec.hs
index 38cdbc8..a76bdcd 100644
--- a/haddock-api/test/Haddock/Backends/Hyperlinker/ParserSpec.hs
+++ b/haddock-api/test/Haddock/Backends/Hyperlinker/ParserSpec.hs
@@ -52,7 +52,7 @@ parseSpec = do
     it "should recognize preprocessor directives" $ do
         "\n#define foo bar" `shouldParseTo` [TkSpace, TkCpp]
         "x # y" `shouldParseTo`
-            [TkIdentifier, TkSpace, TkCpp, TkSpace,TkIdentifier]
+            [TkIdentifier, TkSpace, TkOperator, TkSpace,TkIdentifier]
 
     it "should distinguish basic language constructs" $ do
         "(* 2) <$> (\"abc\", foo)" `shouldParseTo`
diff --git a/hypsrc-test/ref/src/Operators.html b/hypsrc-test/ref/src/Operators.html
index 9ed24ab..beefda5 100644
--- a/hypsrc-test/ref/src/Operators.html
+++ b/hypsrc-test/ref/src/Operators.html
@@ -648,6 +648,128 @@
       >)</span
       ><span class=""
       >
+
+
+</span
+      ><span class="hs-special"
+      >(</span
+      ><span class="hs-operator"
+      >#.#</span
+      ><span class="hs-special"
+      >)</span
+      ><span class=""
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span class=""
+      > </span
+      ><a href="#local-0"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class=""
+      > </span
+      ><span class="hs-glyph"
+      >-></span
+      ><span class=""
+      > </span
+      ><a href="#local-0"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class=""
+      > </span
+      ><span class="hs-glyph"
+      >-></span
+      ><span class=""
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#local-0"
+      ><span class="hs-identifier hs-type"
+	>c</span
+	></a
+      ><span class=""
+      > </span
+      ><span class="hs-glyph"
+      >-></span
+      ><span class=""
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#local-0"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >,</span
+      ><span class=""
+      > </span
+      ><a href="#local-0"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span class="hs-special"
+      >)</span
+      ><span class=""
+      >
+</span
+      ><a name="local-0"
+      ><a href="#local-0"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span class=""
+      > </span
+      ><a name="%23.%23"
+      ><a href="Operators.html#%23.%23"
+	><span class="hs-operator"
+	  >#.#</span
+	  ></a
+	></a
+      ><span class=""
+      > </span
+      ><a name="local-0"
+      ><a href="#local-0"
+	><span class="hs-identifier"
+	  >b</span
+	  ></a
+	></a
+      ><span class=""
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span class=""
+      > </span
+      ><span class="hs-identifier hs-var"
+      >const</span
+      ><span class=""
+      > </span
+      ><span class="hs-operator hs-var"
+      >$</span
+      ><span class=""
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#local-0"
+      ><span class="hs-identifier hs-var"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >,</span
+      ><span class=""
+      > </span
+      ><a href="#local-0"
+      ><span class="hs-identifier hs-var"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span class=""
+      >
 </span
       ></pre
     ></body



More information about the ghc-commits mailing list