2 files changed, 12 insertions, 26 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
 
diff --git a/src/LambdaCube/Compiler/Parser.hs b/src/LambdaCube/Compiler/Parser.hs
index 78942063..b7112bf4 100644
--- a/src/LambdaCube/Compiler/Parser.hs
+++ b/src/LambdaCube/Compiler/Parser.hs
@@ -363,7 +363,7 @@ parseTerm prec = withRange setSI $ case prec of
     PrecApp ->
         apps' <$> try "record" (sVar upperCase <* reservedOp "{") <*> (commaSep $ lowerCase *> reservedOp "=" *> ((,) Visible <$> parseTerm PrecLam)) <* reservedOp "}"
      <|> apps' <$> parseTerm PrecSwiz <*> many (hiddenTerm (parseTTerm PrecSwiz) $ parseTerm PrecSwiz)
-    PrecSwiz -> level PrecProj $ \t -> try "swizzling" $ mkSwizzling t <$> lexeme (char '%' *> manyNM 1 4 (satisfy (`elem` ("xyzwrgba" :: String))))
+    PrecSwiz -> level PrecProj $ \t -> mkSwizzling t <$> lexeme (try "swizzling" $ char '%' *> manyNM 1 4 (satisfy (`elem` ("xyzwrgba" :: String))))
     PrecProj -> level PrecAtom $ \t -> try "projection" $ mkProjection t <$ char '.' <*> sepBy1 (sLit . LString <$> lowerCase) (char '.')
     PrecAtom ->
          mkLit <$> namespace <*> try "literal" parseLit
@@ -998,12 +998,8 @@ extensionMap = Map.fromList $ map (show &&& id) [toEnum 0 .. ]
 
 parseExtensions :: P [Extension]
 parseExtensions
-    = lexeme (try "language pragma" $ string "{-#")
-   *> lexeme (string "LANGUAGE")
-   *> lexeme (commaSep $ lexeme ext)
-   <* lexeme (string "#-}")
+    = try "pragma" (symbol "{-#") *> symbol "LANGUAGE" *> commaSep (lexeme ext) <* symbol "#-}"
   where
-    lexeme p = p <* skipMany (satisfy isSpace)
     ext = do
         s <- some $ satisfy isAlphaNum
         maybe