[commit: ghc] master: Workaround haddock parser error caused by 5e7406d9 (3b8b826)

git at git.haskell.org git at git.haskell.org
Thu Jul 17 07:11:39 UTC 2014


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3b8b826b24f3d1656560c5f1b95acf2578d26a59/ghc

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

commit 3b8b826b24f3d1656560c5f1b95acf2578d26a59
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Jul 17 09:04:46 2014 +0200

    Workaround haddock parser error caused by 5e7406d9
    
    Haddock complains if a comment looks like a misplaced Haddock-comment.
    In this case, the comment line starting with `-- *kind* and` looked like a
    section-heading to Haddock and caused the following error:
    
        parse error on input ‘-- *kind* and role of its argument. Luckily, laziness should’
    
    This commit just rewraps the line so that no `*` appear at the start of the
    non-Haddock comment lines.
    
    Signed-off-by: Herbert Valerio Riedel <hvr at gnu.org>


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

3b8b826b24f3d1656560c5f1b95acf2578d26a59
 compiler/types/Coercion.lhs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/types/Coercion.lhs b/compiler/types/Coercion.lhs
index 8337681..adfe9d7 100644
--- a/compiler/types/Coercion.lhs
+++ b/compiler/types/Coercion.lhs
@@ -1888,9 +1888,9 @@ coercionKindRole = go
 -- | Retrieve the role from a coercion.
 coercionRole :: Coercion -> Role
 coercionRole = snd . coercionKindRole
-  -- There's not a better way to do this, because NthCo needs the
-  -- *kind* and role of its argument. Luckily, laziness should
-  -- generally avoid the need for computing kinds in other cases.
+  -- There's not a better way to do this, because NthCo needs the *kind*
+  -- and role of its argument. Luckily, laziness should generally avoid
+  -- the need for computing kinds in other cases.
 
 \end{code}
 



More information about the ghc-commits mailing list