X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=compiler%2Fparser%2FHaddockLex.x;fp=compiler%2Fparser%2FHaddockLex.x;h=7ed365f9ba910196a98d7b7b08bf6eff55359bec;hb=1b9618c37bb254e1d16aa286ceedc9a81f41e871;hp=d9b4c03b19160133a2b483b4691f8a60066ea9c6;hpb=911860671d3f35a52b54869a7a3e7730d7c631dd;p=ghc-hetmet.git

diff --git a/compiler/parser/HaddockLex.x b/compiler/parser/HaddockLex.x
index d9b4c03..7ed365f 100644
--- a/compiler/parser/HaddockLex.x
+++ b/compiler/parser/HaddockLex.x
@@ -63,7 +63,7 @@ $ident    = [$alphanum \'\_\.\!\#\$\%\&\*\+\/\<\=\>\?\@\\\\\^\|\-\~]
   () 			{ begin string }
 }
 
-<birdtrack> .*	\n?	{ strtoken TokBirdTrack `andBegin` line }
+<birdtrack> .*	\n?	{ strtokenNL TokBirdTrack `andBegin` line }
 
 <string,def> {
   $special			{ strtoken $ \s -> TokSpecial (head s) }
@@ -78,7 +78,7 @@ $ident    = [$alphanum \'\_\.\!\#\$\%\&\*\+\/\<\=\>\?\@\\\\\^\|\-\~]
   -- allow special characters through if they don't fit one of the previous
   -- patterns.
   [\/\'\`\<\#\&\\]			{ strtoken TokString }
-  [^ $special \/ \< \# \n \'\` \& \\ \]]* \n { strtoken TokString `andBegin` line }
+  [^ $special \/ \< \# \n \'\` \& \\ \]]* \n { strtokenNL TokString `andBegin` line }
   [^ $special \/ \< \# \n \'\` \& \\ \]]+    { strtoken TokString }
 }
 
@@ -141,8 +141,11 @@ andBegin act new_sc = \str _ cont -> act str new_sc cont
 token :: Token -> Action
 token t = \_ sc cont -> t : cont sc
 
-strtoken :: (String -> Token) -> Action
+strtoken, strtokenNL :: (String -> Token) -> Action
 strtoken t = \str sc cont -> t str : cont sc
+strtokenNL t = \str sc cont -> t (filter (/= '\r') str) : cont sc
+-- ^ We only want LF line endings in our internal doc string format, so we
+-- filter out all CRs.
 
 begin :: StartCode -> Action
 begin sc = \_ _ cont -> cont sc