cleanup

[minfp.git] / parse.icl

diff --git a/parse.icl b/parse.icl
index 6a9ab29..5bb4bac 100644 (file)
--- a/parse.icl
+++ b/parse.icl
@@ -18,9 +18,12 @@ import ast
 (<:>) l r = (\xs->[l:xs]) <$> r
 
 :: Token = TTEq | TTSemiColon | TTLambda | TTDot | TTBrackOpen | TTBrackClose | TTBool Bool | TTInt Int | TTOp [Char] | TTIdent [Char]
+
 derive gEq Token
-instance toString Token where toString t = printToString t
 derive gPrint Token
+
+instance toString Token where toString t = printToString t
+
 lex :: [Char] -> Either [String] [Token]
 lex [] = pure []
 lex [';':ts] = TTSemiColon <:> lex ts
@@ -109,7 +112,8 @@ where
                        (map fst $ sortBy (on (<) snd) ifxs)
                $   pChainl (pure App)
                $   Lambda <$ pToken TTLambda <*> pId <* pToken TTDot <*> pExpression
+               <|> Var <$ pToken TTBrackOpen <*> pOp <* pToken TTBrackClose
                <|> pToken TTBrackOpen *> pExpression <* pToken TTBrackClose
-               <|> Lit o Int <$> (\(TTInt i)->i) <$> pTop ? (\t->t=:(TTInt _))
+               <|> (\(TTInt i)->Lit (Int i)) <$> pTop ? (\t->t=:(TTInt _))
                <|> (\(TTBool i)->Lit (Bool i)) <$> pTop ? (\t->t=:(TTBool _))
                <|> Var <$> pId