X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Flex.icl;h=b3c76cd1ff70053bf30c57b575a2a96f7ec1a248;hb=0deec3b5e205945dc8cf8a00ca8cff4c96f42552;hp=1828e37133ddcc053fba5a764f309799c3477ae6;hpb=3952a068daa6e70d73f7ae9b3b68548289bbef99;p=cc1516.git

diff --git a/src/lex.icl b/src/lex.icl
index 1828e37..b3c76cd 100644
--- a/src/lex.icl
+++ b/src/lex.icl
@@ -15,8 +15,8 @@ lexer r = case runParser lexProgram r of
 	(Left e, _) = Left $ toString e
 
 lexProgram :: Parser Char [Token]
-lexProgram = some lexToken <* eof
-	>>= \ts->pure $ (map (\t->(0, 0, t)) (catMaybes ts))
+lexProgram = catMaybes <$> some lexToken <* eof
+	>>= \ts->pure $ (map (\t->(0, 0, t)) ts)
 
 lexToken :: Parser Char (Maybe TokenValue)
 lexToken = 
@@ -72,4 +72,4 @@ lexToken =
 		lexEscape = fromJust <$> ((
 			lexOp "a" (toChar 7) <|> lexOp "b" '\b' <|> lexOp "f" '\f' <|>
 			lexOp "n" '\n' <|> lexOp "r" '\t' <|> lexOp "v" '\v' <|>
-			lexOp "'" '\'') <?> ("Unknown escape", 0))
+			lexOp "'" '\'') <?> LexError "Unknown escape")