better lexer

[cc1516.git] / src / lex.icl

diff --git a/src/lex.icl b/src/lex.icl
index 1828e37..ac5168f 100644 (file)
--- 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 =