X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=src%2Flex.icl;h=ac5168f4d36ffcebd808061c60e8019996c07bb7;hb=65f6bf827fa2f4d2f79f9e3bda990b7e4c4df5f1;hp=1828e37133ddcc053fba5a764f309799c3477ae6;hpb=3952a068daa6e70d73f7ae9b3b68548289bbef99;p=cc1516.git diff --git a/src/lex.icl b/src/lex.icl index 1828e37..ac5168f 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 =