1 files changed, 10 insertions, 20 deletions

diff --git a/src/LambdaCube/Compiler/Lexer.hs b/src/LambdaCube/Compiler/Lexer.hs
index 2b2407dd..6a269f6b 100644
--- a/src/LambdaCube/Compiler/Lexer.hs
+++ b/src/LambdaCube/Compiler/Lexer.hs
@@ -533,29 +533,19 @@ symbol name
 whiteSpace = ignoreAbsoluteIndentation (localTokenMode (const Pa.Any) whiteSpace')
 whiteSpace' = skipMany (simpleSpace <|> oneLineComment <|> multiLineComment <?> "")
 
-simpleSpace =
-    skipMany1 (satisfy isSpace)
+simpleSpace
+    = skipMany1 (satisfy isSpace)
 
-oneLineComment =
-    do{ try (string "--" >> many (char '-') >> notFollowedBy opLetter)
-      ; skipMany (satisfy (/= '\n'))
-      ; return ()
-      }
-
-commentStart    = "{-"
-commentEnd      = "-}"
+oneLineComment
+    =  try (string "--" >> many (char '-') >> notFollowedBy opLetter)
+    >> skipMany (satisfy (/= '\n'))
 
-multiLineComment =
-    do { try (string commentStart)
-       ; inCommentMulti
-       }
+multiLineComment = try (string "{-") *> inCommentMulti
 
 inCommentMulti
-    =   do{ try (string commentEnd) ; return () }
-    <|> do{ multiLineComment                     ; inCommentMulti }
-    <|> do{ skipMany1 (noneOf startEnd)          ; inCommentMulti }
-    <|> do{ oneOf startEnd                       ; inCommentMulti }
+    =   try (() <$ string "-}")
+    <|> multiLineComment         *> inCommentMulti
+    <|> skipMany1 (noneOf "{}-") *> inCommentMulti
+    <|> oneOf "{}-"              *> inCommentMulti
     <?> "end of comment"
-    where
-      startEnd   = commentEnd ++ commentStart