[commit: haddock] T6018-injective-type-families, adamse-D1033, ghc-head, master, metainfo, wip/10268, wip/10313, wip/D538, wip/D538-1, wip/D538-2, wip/D538-3, wip/D538-4, wip/D538-5, wip/D538-6, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T9840, wip/api-annot-tweaks-7.10, wip/api-annots-ghc-7.10-3, wip/orf-reboot: Minor code simplification (86ee241)

git at git.haskell.org git at git.haskell.org
Wed Jul 8 08:32:46 UTC 2015


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

On branches: T6018-injective-type-families,adamse-D1033,ghc-head,master,metainfo,wip/10268,wip/10313,wip/D538,wip/D538-1,wip/D538-2,wip/D538-3,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T9840,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/86ee2412abacff33340559f2f4626ea44564a038

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

commit 86ee2412abacff33340559f2f4626ea44564a038
Author: Simon Hengel <sol at typeful.net>
Date:   Sat Nov 8 11:32:42 2014 +0800

    Minor code simplification


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

86ee2412abacff33340559f2f4626ea44564a038
 haddock-library/src/Documentation/Haddock/Parser.hs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/haddock-library/src/Documentation/Haddock/Parser.hs b/haddock-library/src/Documentation/Haddock/Parser.hs
index bea1803..b3387f5 100644
--- a/haddock-library/src/Documentation/Haddock/Parser.hs
+++ b/haddock-library/src/Documentation/Haddock/Parser.hs
@@ -514,11 +514,10 @@ parseValid = p some
     p p' = do
       vs' <- p' $ utf8String "⋆" <|> return <$> idChar
       let vs = concat vs'
-      c <- peekChar
+      c <- peekChar'
       case c of
-        Just '`' -> return vs
-        Just '\'' -> (\x -> vs ++ "'" ++ x) <$> ("'" *> p many')
-                     <|> return vs
+        '`' -> return vs
+        '\'' -> (\x -> vs ++ "'" ++ x) <$> ("'" *> p many') <|> return vs
         _ -> fail "outofvalid"
 
 -- | Parses UTF8 strings from ByteString streams.



More information about the ghc-commits mailing list