@@ -57,13 +57,16 @@ lexWS = do i <- getInput
59 simpleSpace = skipMany1 (satisfy isSpace)
59 simpleSpace = skipMany1 (satisfy isSpace)
60− oneLineComment = do try (do string ("--")
60+ oneLineComment =
61+ try (void $ string "--\n") <|>
62+ do try (do string "--"
61− satisfy (\x -> x /= '|' && x /= '^'))
63+ satisfy (\x -> x /= '|' && x /= '^'))
62− skipMany (satisfy (/= '\n'))
64+ skipMany (satisfy (/= '\n'))
64− multiLineComment = do try (do string "{-"
65+ multiLineComment =
66+ try (void $ string "{--}") <|>
67+ do try (do string "{-"
65− satisfy (\x -> x /= '|' && x /= '^'))
68+ satisfy (\x -> x /= '|' && x /= '^'))
66− inCommentMulti
69+ inCommentMulti
68 inCommentMulti
71 inCommentMulti
69 = do{ try (string "-}") ; return () }
72 = do{ try (string "-}") ; return () }